Update Azure.Provisioning to latest #6390

eerhardt · 2024-10-21T02:02:58Z

Description

Respond to latest renames getting the API ready for GA release.

I'll use this PR until we get stable versions from @tg-msft.

Also fix an issue when using dashes - in resource names and using AspireV8ResourceNamePropertyResolver. We are prematurely converting the dash to an underscore, and the Azure resource name is not the same as it was in v8. This needs to be fixed together because the APIs we need to fix the issue are being made public in this new Azure.Provisioning version.

Fix #6474

Checklist

Is this feature complete?
- No. Follow-up changes expected. Still need stable versions plus more changes.
Are you including unit tests for the changes and scenario tests if relevant?
- Yes
Did you add public API?
- No
Does the change make any security assumptions or guarantees?
- No
Does the change require an update in our Aspire docs?
- Yes
  - Link to aspire-docs issue: Update Aspire docs for new Azure.Provisioning version in 9.0 docs-aspire#1652

Microsoft Reviewers: Open in CodeFlow

eerhardt · 2024-10-21T02:04:01Z

NuGet.config

@@ -17,6 +17,7 @@
    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
    <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
    <add key="dotnet9-transport" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
+    <add key="azure-sdk-devfeed" value="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json" />


These NuGet.config changes won't be merged. We won't merge this PR until the 1.0.0 versions are on nuget.org.

eerhardt · 2024-10-22T00:07:59Z

src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppsInfrastructure.cs

@@ -886,8 +885,7 @@ private void AddContainerRegistryParameters(ContainerAppConfiguration app)
    // This is a workaround to handle nested formattable strings until the bug is fixed.
    private static BicepValue<string> Interpolate(BicepValueFormattableString text)
    {
-        var formatStringBuilder = new StringBuilder();
-        var arguments = new List<BicepValue<string>>();
+        var bicepStringBuilder = new BicepStringBuilder();


FYI - @davidfowl. We aren't able to get rid of our Format string parsing code from ReferenceExpression. But we are able to use the new BicepStringBuilder here.

I was able to simplify the BicepValueFormattableString class. No need for it to inherit from FormattableString.

We should be able to if you move this logic into the caller right?

I can build up the BicepStringBuilder earlier and not have the BicepValueFormattableString at all. But we will still need to parse the ReferenceExpression.Format string ourselves.

Ah yea, ok.

eerhardt · 2024-10-22T00:09:32Z

~~Expecting 1 test failure due to Azure/azure-sdk-for-net#46742~~

This should be fixed now.

Respond to latest renames getting the API ready for GA release. Fix dotnet#6376

This hits an issue with `${null}` that is being fixed with Azure/azure-sdk-for-net#46742.

eerhardt · 2024-10-25T02:09:20Z

This is now ready for review. We have all the changes from the Azure.Provisioning libraries we need for 9.0.0 GA.

src/Aspire.Hosting.Azure.Sql/AzureSqlExtensions.cs

eerhardt · 2024-10-25T03:11:39Z

/backport to release/9.0

github-actions · 2024-10-25T03:11:50Z

Started backporting to release/9.0: https://github.com/dotnet/aspire/actions/runs/11511183771

eerhardt · 2024-10-25T15:42:22Z

/backport to release/9.0

github-actions · 2024-10-25T15:42:33Z

Started backporting to release/9.0: https://github.com/dotnet/aspire/actions/runs/11521283799

…has a dash. In .NET Aspire 8.x, when the Aspire resource name has dashes, we used those dashes in the Azure resource name. But we are incorrectly converting them to underscores. Fix dotnet#6474

eerhardt · 2024-10-25T16:36:39Z

/backport to release/9.0

github-actions · 2024-10-25T16:36:53Z

Started backporting to release/9.0: https://github.com/dotnet/aspire/actions/runs/11522041527

…Options. Fix dotnet#6496

eerhardt · 2024-10-25T17:50:32Z

/backport to release/9.0

github-actions · 2024-10-25T17:50:43Z

Started backporting to release/9.0: https://github.com/dotnet/aspire/actions/runs/11523011977

eerhardt · 2024-10-27T23:01:03Z

This has all the changes from [release/9.0] Update Azure.Provisioning to latest (dotnet/aspire#6489) merged into it. Looking for an approval so we can merge it into main.

davidfowl · 2024-10-28T00:03:07Z

/azp run

azure-pipelines · 2024-10-28T00:03:20Z

Azure Pipelines successfully started running 1 pipeline(s).

davidfowl · 2024-10-28T06:55:23Z

/azp run

azure-pipelines · 2024-10-28T06:55:36Z

Azure Pipelines successfully started running 1 pipeline(s).

eerhardt requested review from davidfowl, mitchdenny and tg-msft October 21, 2024 02:02

eerhardt commented Oct 21, 2024

View reviewed changes

eerhardt commented Oct 22, 2024

View reviewed changes

eerhardt added 7 commits October 21, 2024 21:44

Update Azure.Provisioning to latest

2738bc9

Respond to latest renames getting the API ready for GA release. Fix dotnet#6376

Rename properties to match new type names.

d06321c

Add azure dev feed to test configs

88c15fb

Use IsAccessKeyAuthenticationDisabled property

4912749

Update to the latest dev build.

5c9f739

This hits an issue with `${null}` that is being fixed with Azure/azure-sdk-for-net#46742.

Update to latest version

44ee80e

Fix ContainerAppExtensions for new Azure.Provisioning version

b1b7194

eerhardt force-pushed the UpdateCDK branch from 9e56058 to b1b7194 Compare October 22, 2024 03:00

eerhardt added 4 commits October 21, 2024 22:09

Simplify BicepValueFormattableString

aeba560

Simplify ReferenceExpression to BicepValue<string> logic

94ffd45

Fix Azure Redis test for new property order

184a67a

Update to latest Azure.Provisioning version.

100cb4a

eerhardt marked this pull request as ready for review October 25, 2024 02:08

eerhardt requested a review from radical as a code owner October 25, 2024 02:08

eerhardt commented Oct 25, 2024

View reviewed changes

src/Aspire.Hosting.Azure.Sql/AzureSqlExtensions.cs Outdated Show resolved Hide resolved

eerhardt commented Oct 25, 2024

View reviewed changes

src/Aspire.Hosting.Azure.Sql/AzureSqlExtensions.cs Outdated Show resolved Hide resolved

Apply suggestions from code review

0adc809

github-actions bot mentioned this pull request Oct 25, 2024

[release/9.0] Update Azure.Provisioning to latest #6489

Merged

Update playground bicep

2add4c1

Fix issue in AspireV8ResourceNamePropertyResolver when resource name …

5e94eca

…has a dash. In .NET Aspire 8.x, when the Aspire resource name has dashes, we used those dashes in the Azure resource name. But we are incorrectly converting them to underscores. Fix dotnet#6474

Allow customizing Azure ContainerApp resources with ProvisioningBuild…

b1760c1

…Options. Fix dotnet#6496

build-analysis bot mentioned this pull request Oct 25, 2024

The Operation will be canceled. The next steps may not contain expected logs. dotnet/dnceng#3008

Open

3 tasks

joperezr and others added 3 commits October 27, 2024 17:58

Update packages to stable

9d32d30

Revert test nuget.config changes.

ccb1355

Fix up variable name.

5ffb437

eerhardt enabled auto-merge (squash) October 27, 2024 23:01

davidfowl approved these changes Oct 28, 2024

View reviewed changes

build-analysis bot mentioned this pull request Oct 28, 2024

Some tests timing out on helix #5247

Open

eerhardt merged commit be2a895 into dotnet:main Oct 28, 2024
9 checks passed

eerhardt deleted the UpdateCDK branch October 28, 2024 13:50

github-actions bot locked and limited conversation to collaborators Nov 28, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Azure.Provisioning to latest #6390

Update Azure.Provisioning to latest #6390

eerhardt commented Oct 21, 2024 •

edited

Loading

eerhardt Oct 21, 2024

eerhardt Oct 22, 2024

eerhardt Oct 22, 2024 •

edited

Loading

davidfowl Oct 22, 2024

eerhardt Oct 22, 2024 •

edited

Loading

davidfowl Oct 23, 2024

eerhardt commented Oct 22, 2024 •

edited

Loading

eerhardt commented Oct 25, 2024

eerhardt commented Oct 25, 2024

github-actions bot commented Oct 25, 2024

eerhardt commented Oct 25, 2024

github-actions bot commented Oct 25, 2024

eerhardt commented Oct 25, 2024

github-actions bot commented Oct 25, 2024

eerhardt commented Oct 25, 2024

github-actions bot commented Oct 25, 2024

eerhardt commented Oct 27, 2024

davidfowl commented Oct 28, 2024

azure-pipelines bot commented Oct 28, 2024

davidfowl commented Oct 28, 2024

azure-pipelines bot commented Oct 28, 2024

Update Azure.Provisioning to latest #6390

Update Azure.Provisioning to latest #6390

Conversation

eerhardt commented Oct 21, 2024 • edited Loading

Description

Checklist

Microsoft Reviewers: Open in CodeFlow

eerhardt Oct 21, 2024

Choose a reason for hiding this comment

eerhardt Oct 22, 2024

Choose a reason for hiding this comment

eerhardt Oct 22, 2024 • edited Loading

Choose a reason for hiding this comment

davidfowl Oct 22, 2024

Choose a reason for hiding this comment

eerhardt Oct 22, 2024 • edited Loading

Choose a reason for hiding this comment

davidfowl Oct 23, 2024

Choose a reason for hiding this comment

eerhardt commented Oct 22, 2024 • edited Loading

eerhardt commented Oct 25, 2024

eerhardt commented Oct 25, 2024

github-actions bot commented Oct 25, 2024

eerhardt commented Oct 25, 2024

github-actions bot commented Oct 25, 2024

eerhardt commented Oct 25, 2024

github-actions bot commented Oct 25, 2024

eerhardt commented Oct 25, 2024

github-actions bot commented Oct 25, 2024

eerhardt commented Oct 27, 2024

davidfowl commented Oct 28, 2024

azure-pipelines bot commented Oct 28, 2024

davidfowl commented Oct 28, 2024

azure-pipelines bot commented Oct 28, 2024

eerhardt commented Oct 21, 2024 •

edited

Loading

eerhardt Oct 22, 2024 •

edited

Loading

eerhardt Oct 22, 2024 •

edited

Loading

eerhardt commented Oct 22, 2024 •

edited

Loading